win32: Stop using MODx modifiers

The win32 backend is using GDK_MOD2_MASK for AltGr,
so define GDK_MOD2_MASK locally to keep this working,
but remove any mention of GDK_MOD3_MASK,...,GDK_MOD5_MASK.

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index fb2867ec834585e433163276d1e5ab94266a54a2..4dca31ce36861478887610301bbda41b8f65796f 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -72,6 +72,8 @@
 
 #include <imm.h>
 
+#define GDK_MOD2_MASK (1 << 4)
+
 #ifndef XBUTTON1
 #define XBUTTON1 1
 #define XBUTTON2 2
@@ -743,9 +745,6 @@ print_event_state (guint state)
   CASE (CONTROL);
   CASE (ALT);
   CASE (MOD2);
-  CASE (MOD3);
-  CASE (MOD4);
-  CASE (MOD5);
   CASE (BUTTON1);
   CASE (BUTTON2);
   CASE (BUTTON3);

diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index 9350c121f5036ca6b3153033300e4611891bcfe1..3183168bdc211708306bf49ea879c25ac1397972 100644 (file)
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -38,6 +38,8 @@
 #include "gdkkeysprivate.h"
 #include "gdkwin32keys.h"
 
+#define GDK_MOD2_MASK (1 << 4)
+
 enum _GdkWin32KeyLevelState
 {
   GDK_WIN32_LEVEL_NONE = 0,